Skip to content

Merge develop into main#31

Merged
pallyoung merged 23 commits into
mainfrom
develop
May 11, 2026
Merged

Merge develop into main#31
pallyoung merged 23 commits into
mainfrom
develop

Conversation

@pallyoung

@pallyoung pallyoung commented May 11, 2026

Copy link
Copy Markdown
Contributor

Summary

  • merge the latest develop branch updates into main
  • include the websocket/terminal reconnect recovery fix so terminal replay backfills after silent disconnects
  • include the recent terminal preference, copy-on-select, mobile settings, and e2e UI updates already landed on develop

Test Plan

  • pnpm --filter @coder-studio/web exec vitest run src/ws/tests/client.test.ts
  • pnpm --filter @coder-studio/web exec vitest run src/features/terminal-panel/tests/xterm-host.test.tsx
  • pnpm --filter @coder-studio/server exec vitest run src/tests/ws-hub.test.ts

pallyoung added 23 commits May 11, 2026 00:48
@pallyoung
feat: persist terminal copy-on-select setting
6b91b25
@pallyoung
feat: hydrate terminal preferences at app startup
e5d13e8
@pallyoung
test: isolate terminal preference hydration state
62b5e13
@pallyoung
feat: add settings UI for terminal copy-on-select
a8c4fd9
@pallyoung
fix: preserve terminal copy-on-select sync on stale loads
3621948
@pallyoung
docs: refresh workspace overview screenshot
ca1bfd7
@pallyoung
Merge remote-tracking branch 'origin/main' into develop
3873db4
@pallyoung
fix: ignore stale copy-on-select defaults
4fefdbd
@pallyoung
fix: use terminal preferences atom for settings sync
2d27c00
@pallyoung
feat: copy terminal selection on desktop
a4d74b6
@pallyoung
fix: address review feedback for terminal copy-on-select
ade538d
@pallyoung
Merge branch 'feat/terminal-copy-on-select' into develop
3fcafce
@pallyoung
fix: handle xterm selection disposable cleanup
5811130
@pallyoung
Merge branch 'fix/terminal-selection-dispose' into develop
2fc06ec
@pallyoung
refactor: move terminal settings into general
8261fcb
@pallyoung
Merge branch 'feat/move-terminal-settings-general' into develop
92fe0aa
@pallyoung
fix: restore mobile settings detail scrolling
17c6cc5
@pallyoung
Merge branch 'fix/mobile-settings-scroll' into develop
a4140c0
@pallyoung
feat(web): add isolated e2e ui screenshot suite
4a04311
@pallyoung
Merge branch 'feat/e2e-ui' into develop
c6ec89d
@pallyoung
fix(web): make e2e-ui command windows compatible
9c63cee
@pallyoung
fix(ws): recover terminal replay after silent disconnects
3f4a395
@pallyoung
chore(changeset): add patch release note for ws recovery
3139ef4
@pallyoung
pallyoung merged commit 96adac1 into main May 11, 2026
2 checks passed
@github-actions github-actions Bot mentioned this pull request May 11, 2026
Merged
pallyoung added a commit that referenced this pull request Jun 7, 2026
@pallyoung
Merge pull request #31 from spencerkit/develop
3d859b9 
Merge develop into main
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@pallyoung